From e4c0b1b539def3857573e7fcb1dbfad60c757a59 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 17 Nov 2009 21:55:40 -0800 Subject: [PATCH 2/2] Changed all known Run.getNumber() references to Run.get{,Full}DisplayName() where appropriate --- core/src/main/java/hudson/tasks/MailSender.java | 2 +- .../hudson/model/AbstractBuild/changes.jelly | 4 ++-- .../hudson/model/AbstractBuild/index.jelly | 6 +++--- .../hudson/model/ExternalRun/sidepanel.jelly | 4 ++-- .../hudson/model/ParametersAction/index.jelly | 2 +- .../PermalinkProjectAction/Permalink/link.jelly | 4 ++-- .../Permalink/link.properties | 2 +- .../Permalink/link_de.properties | 2 +- .../Permalink/link_fr.properties | 2 +- .../Permalink/link_ja.properties | 2 +- .../Permalink/link_nl.properties | 2 +- .../Permalink/link_pt_BR.properties | 2 +- .../Permalink/link_ru.properties | 2 +- .../Permalink/link_tr.properties | 2 +- .../hudson/model/Run/artifacts-index.jelly | 4 ++-- .../resources/hudson/model/Run/confirmDelete.jelly | 4 ++-- .../main/resources/hudson/model/Run/console.jelly | 2 +- .../scm/AbstractScmTagAction/inProgress.jelly | 4 ++-- .../hudson/scm/CVSSCM/TagAction/tagForm.jelly | 4 ++-- .../hudson/views/LastFailureColumn/column.jelly | 4 ++-- .../hudson/views/LastStableColumn/column.jelly | 2 +- .../hudson/views/LastSuccessColumn/column.jelly | 4 ++-- .../hudson/widgets/HistoryWidget/entry.jelly | 2 +- .../main/resources/lib/hudson/buildListTable.jelly | 4 ++-- .../hudson/maven/MavenBuild/executedMojos.jelly | 4 ++-- 25 files changed, 38 insertions(+), 38 deletions(-) diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index 7efbf31..186b184 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -354,7 +354,7 @@ public class MailSender { } private String getSubject(AbstractBuild build, String caption) { - return caption + build.getProject().getFullDisplayName() + " #" + build.getNumber(); + return caption + build.getFullDisplayName(); } /** diff --git a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly index 9f27ef0..ad4a009 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly +++ b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly @@ -26,11 +26,11 @@ THE SOFTWARE. Displays the console output --> - + ${%Changes} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly index 2d0df3e..ee83bb5 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly +++ b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - +
@@ -46,7 +46,7 @@ THE SOFTWARE.
- ${%Build} #${it.number} + ${%Build} ${it.displayName} () @@ -152,4 +152,4 @@ THE SOFTWARE.
-
\ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly b/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly index d03fcaa..2da92a6 100644 --- a/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. Side panel for the build view. --> - + @@ -43,4 +43,4 @@ THE SOFTWARE. - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/ParametersAction/index.jelly b/core/src/main/resources/hudson/model/ParametersAction/index.jelly index 4726a74..81b84ca 100644 --- a/core/src/main/resources/hudson/model/ParametersAction/index.jelly +++ b/core/src/main/resources/hudson/model/ParametersAction/index.jelly @@ -32,7 +32,7 @@ THE SOFTWARE. -

${%Build} #${build.number}

+

${%Build} ${build.displayName}

  • - ${%format(it.displayName,b.number,b.timestampString)} + ${%format(it.displayName,b.displayName,b.timestampString)}
  • - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties index e283bf8..7472ced 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} ago \ No newline at end of file +format={0} ({1}), {2} ago diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties index 53641a6..754d70e 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), vor {2} +format={0} ({1}), vor {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties index fd98fe5..f061756 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), il y a {2} +format={0} ({1}), il y a {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties index 01dd2de..cdd0546 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} \ No newline at end of file +format={0} ({1}), {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties index 17fe161..a8a7540 100755 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), sinds {2} +format={0} ({1}), sinds {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties index 0960b8b..376a174 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} atr\u00E1s +format={0} ({1}), {2} atr\u00E1s diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties index 1a442c3..8938df9 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} \u043d\u0430\u0437\u0430\u0434 +format={0} ({1}), {2} \u043d\u0430\u0437\u0430\u0434 diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties index 15176b8..ad3fa8b 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} \u00f6nce +format={0} ({1}), {2} \u00f6nce diff --git a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly index 99c184b..4e1fadc 100644 --- a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly +++ b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - + @@ -36,4 +36,4 @@ THE SOFTWARE. - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/Run/confirmDelete.jelly b/core/src/main/resources/hudson/model/Run/confirmDelete.jelly index b864d0e..5db6153 100644 --- a/core/src/main/resources/hudson/model/Run/confirmDelete.jelly +++ b/core/src/main/resources/hudson/model/Run/confirmDelete.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. - + @@ -39,4 +39,4 @@ THE SOFTWARE. - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly index b0aac24..1c889fb 100644 --- a/core/src/main/resources/hudson/model/Run/console.jelly +++ b/core/src/main/resources/hudson/model/Run/console.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. Displays the console output --> - + diff --git a/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly b/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly index 0ed31cd..e20a434 100644 --- a/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly +++ b/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. -

    Build #${it.build.number}

    +

    Build ${it.build.displayName}

    ${%Tagging is in progress:}

    @@ -34,4 +34,4 @@ THE SOFTWARE.
    - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/scm/CVSSCM/TagAction/tagForm.jelly b/core/src/main/resources/hudson/scm/CVSSCM/TagAction/tagForm.jelly index 6450d25..e5b2e78 100644 --- a/core/src/main/resources/hudson/scm/CVSSCM/TagAction/tagForm.jelly +++ b/core/src/main/resources/hudson/scm/CVSSCM/TagAction/tagForm.jelly @@ -61,10 +61,10 @@ THE SOFTWARE. - + -

    Build #${it.build.number}

    +

    Build ${it.build.displayName}

    diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly index deb4565..9509766 100644 --- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly @@ -27,11 +27,11 @@ THE SOFTWARE. ${lfBuild.timestampString} - (#${lfBuild.number}) + (${lfBuild.displayName}) ${%N/A} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly index b6159cb..93d252b 100644 --- a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly @@ -28,7 +28,7 @@ THE SOFTWARE. ${lstBuild.timestampString} - (#${lstBuild.number}) + (${lstBuild.displayName}) ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly index 1bf4eb9..b6c3032 100644 --- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly @@ -27,11 +27,11 @@ THE SOFTWARE. ${lsBuild.timestampString} - (#${lsBuild.number}) + (${lsBuild.displayName}) ${%N/A} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly index 60b7390..d1cceaa 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly @@ -31,7 +31,7 @@ THE SOFTWARE. ${build.iconColor.description} - #${build.number} + ${build.displayName} diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index a289b22..dea812b 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -51,7 +51,7 @@ THE SOFTWARE. ${b.parent.displayName} - #${b.number} + ${b.displayName} ${b.timestampString} @@ -68,4 +68,4 @@ THE SOFTWARE.
    - \ No newline at end of file + diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly index 77399f9..94d8967 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly +++ b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - +

    ${%Executed Mojos}

    @@ -78,4 +78,4 @@ THE SOFTWARE.
    -
    \ No newline at end of file + -- 1.6.3.3